From a6e0902df8d01de24634f18406d75635fe57d3f7 Mon Sep 17 00:00:00 2001 From: Eduardo Bautista Date: Sat, 6 Sep 2014 23:39:18 -0500 Subject: [PATCH] Update output to match latest cargo build --- src/doc/source/guide.md | 14 +++++++------- src/doc/source/index.md | 8 ++++---- src/doc/source/manifest.md | 4 ++-- src/doc/source/native-build.md | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/doc/source/guide.md b/src/doc/source/guide.md index 13d99f54c..3fa8edcc8 100644 --- a/src/doc/source/guide.md +++ b/src/doc/source/guide.md @@ -67,7 +67,7 @@ Here's what's in `src/main.rs`: ```rs fn main() { - println!("Hello world!") + println!("Hello, world!") } ``` @@ -81,17 +81,17 @@ And then run it: ```shell $ ./target/hello_world -Hello world! +Hello, world! ``` We can also use `cargo run` to compile and then run it, all in one step:
$ cargo run
    Fresh hello-world v0.0.1 (file:///path/to/project/hello_world)
+class="s1">     Fresh hello_world v0.0.1 (file:///path/to/project/hello_world)
    Running `target/hello_world`
-Hello world!
+Hello, world! You'll now notice a new file, `Cargo.lock`. It contains information about our dependencies. Since we don't have any yet, it's not very interesting. @@ -123,7 +123,7 @@ To depend on a library, add it to your `Cargo.toml`. ```toml [package] -name = "hello-world" +name = "hello_world" version = "0.0.1" authors = ["Your Name "] @@ -159,7 +159,7 @@ Compile it:
$ cargo run
    Compiling color v0.0.1 (https://github.com/bjz/color-rs.git#bf739419)
-   Compiling hello-world v0.0.1 (file:///path/to/project/hello_world)
+   Compiling hello_world v0.0.1 (file:///path/to/project/hello_world)
      Running `target/hello_world`
 Converting RGB to HSV!
 HSV: HSV { h: 0, s: 1, v: 1 }
@@ -377,7 +377,7 @@ To run your tests, just run `cargo test`: Compiling color v0.0.1 (https://github.com/bjz/color-rs.git#bf739419) Compiling hello-world v0.0.1 (file:///path/to/project/hello_world) +class="s1"> Compiling hello_world v0.0.1 (file:///path/to/project/hello_world) Running target/test/hello_world-9c2b65bbb79eabce diff --git a/src/doc/source/index.md b/src/doc/source/index.md index c599fef21..ecc77d563 100644 --- a/src/doc/source/index.md +++ b/src/doc/source/index.md @@ -60,7 +60,7 @@ Here's what's in `src/main.rs`: ```rs fn main() { - println!("Hello world!") + println!("Hello, world!") } ``` @@ -74,17 +74,17 @@ And then run it: ```shell $ ./target/hello_world -Hello world! +Hello, world! ``` We can also use `cargo run` to compile and then run it, all in one step:
$ cargo run
    Fresh hello-world v0.0.1 (file:///path/to/project/hello_world)
+class="s1">     Fresh hello_world v0.0.1 (file:///path/to/project/hello_world)
    Running `target/hello_world`
-Hello world!
+Hello, world! # Going Further diff --git a/src/doc/source/manifest.md b/src/doc/source/manifest.md index 10ae987c6..0480aeaec 100644 --- a/src/doc/source/manifest.md +++ b/src/doc/source/manifest.md @@ -8,8 +8,8 @@ The first section in a `Cargo.toml` is `[package]`. ```toml [package] -name = "hello-world" # the name of the package -version = "1.0.0" # the current version, obeying semver +name = "hello_world" # the name of the package +version = "0.0.1" # the current version, obeying semver authors = [ "you@example.com" ] ``` diff --git a/src/doc/source/native-build.md b/src/doc/source/native-build.md index 8f3739ed9..03bda2b01 100644 --- a/src/doc/source/native-build.md +++ b/src/doc/source/native-build.md @@ -14,7 +14,7 @@ configuration option. [package] name = "hello-world-from-c" -version = "0.1.0" +version = "0.0.1" authors = [ "you@example.com" ] build = "make" ``` @@ -90,7 +90,7 @@ program. [package] name = "hello-world-from-c" -version = "0.1.0" +version = "0.0.1" authors = [ "you@example.com" ] build = "make -C build" ``` -- 2.30.2